Skip to content

refactor(user): migrate admin routes from server - #2738

Merged
shikanime merged 24 commits into
mainfrom
pr/user-migration
Oct 2, 2026
Merged

refactor(user): migrate admin routes from server#2738
shikanime merged 24 commits into
mainfrom
pr/user-migration

Conversation

@shikanime

@shikanime shikanime commented Sep 17, 2026 •
edited
Loading

Copy link
Copy Markdown
Member

Issues liées

Refs #1889

Quel est le comportement actuel ?

Les routes d'administration des utilisateurs (/api/v1/users) sont servies par l'ancienne application Fastify apps/server.

Quel est le nouveau comportement ?

Migration du module user vers apps/server-nestjs :

  • UserController, UserService, UserModule.
  • user-queries.utils.ts : sélections Prisma typées.
  • Enregistrement du module dans main.module.ts.
  • Parité des contrats et codes HTTP contre apps/server/src/resources/user/ (400 sur rôle admin inconnu, take: 5 sur la recherche, émission user.upsert par rôle).

Cette PR introduit-elle un breaking change ?

Non.

Autres informations

Recréée pour #1889 (remplace #2498, non réouvrable après suppression de branche).

github-code-quality[bot]
github-code-quality Bot found potential problems Sep 17, 2026
View reviewed changes
Comment thread apps/server-nestjs/src/modules/user/user.service.ts Fixed
@github-actions github-actions Bot added the built label Sep 17, 2026
@shikanime shikanime self-assigned this Sep 17, 2026
@shikanime shikanime added this to the 9.27.0 milestone Sep 17, 2026
shikanime
shikanime commented Sep 17, 2026
View reviewed changes
Comment thread apps/server-nestjs/src/modules/user/user.service.ts Outdated
shikanime
shikanime commented Sep 17, 2026
View reviewed changes
Comment thread apps/server-nestjs/src/modules/user/user.service.ts Outdated
shikanime
shikanime commented Sep 17, 2026
View reviewed changes
Comment thread apps/server-nestjs/src/modules/user/user.service.ts Outdated
shikanime
shikanime commented Sep 17, 2026
View reviewed changes
Comment thread apps/server-nestjs/src/modules/user/user.controller.ts Outdated
shikanime
shikanime commented Sep 17, 2026
View reviewed changes
Comment thread apps/server-nestjs/src/modules/user/user-queries.utils.ts Outdated
shikanime
shikanime commented Sep 17, 2026
View reviewed changes
Comment thread apps/server-nestjs/src/modules/user/user.service.ts Outdated
shikanime
shikanime commented Sep 17, 2026
View reviewed changes
Comment thread apps/server-nestjs/src/modules/user/user.module.ts Outdated
@shikanime shikanime mentioned this pull request Sep 17, 2026
Merged
@shikanime
shikanime added this pull request to stack #2747 September 18, 2026 08:41
shikanime
shikanime commented Sep 18, 2026
View reviewed changes

@shikanime shikanime left a comment

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Verdict : Changements demandés

Migration fidèle sur le plan requêtes (where, take: 5, rejet de rôle inconnu, union before/after des rôles impactés — la sémantique legacy est respectée). Point positif : la logique where est copiée sans « amélioration » silencieuse, ce qui rend la parité vérifiable ligne à ligne. Un point bloquant de pont événements → plugins, détaillé inline.

Comment thread apps/server-nestjs/src/modules/user/user.service.ts Outdated
Comment thread apps/server-nestjs/src/modules/user/user-queries.utils.ts Outdated
Comment thread apps/server-nestjs/src/modules/user/user.controller.ts Outdated
shikanime
shikanime commented Sep 18, 2026
View reviewed changes

@shikanime shikanime left a comment

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And remove // -- comments

@shikanime shikanime mentioned this pull request Sep 18, 2026
Draft
@shikanime
shikanime removed this pull request from stack #2747 September 18, 2026 09:45
@shikanime
shikanime changed the base branch from main to pr/admin-role-event-bridge September 18, 2026 09:45
@shikanime
shikanime added this pull request to stack #2751 September 18, 2026 09:46
shikanime added a commit that referenced this pull request Sep 23, 2026
@shikanime @yorha-operator
refactor(user): realigner structure et style du module
2f18b61 
Aligne le module user sur le pattern établi par le module zone (#2487) :
- `user-queries.utils.ts` : suppression du `userSelect`/`UserRecord` morts,
  signatures sur `Prisma.TransactionClient`, `createUser` purement DB (la
  validation du doublon email monte dans le service en `ConflictException`).
- `user.service.ts` : extraction de `resolveAdminRoleIds`,
  `patchUsersInTx`, `emitImpactedRoleEvents` ; patch des rôles sous
  transaction.
- `user.module.ts` : imports repliés sur `InfrastructureModule` (déjà
  exporté par celui-ci).

Refs #2738

Co-authored-by: Automata <automata@shikanime.studio>
Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr>
Change-Id: I3bd632f95dd466e585698eba738efcd86a6a6964
@shikanime shikanime mentioned this pull request Sep 23, 2026
Closed
shikanime added a commit that referenced this pull request Sep 23, 2026
@shikanime @yorha-operator
refactor(user): realigner structure et style du module
b9e3500 
Aligne le module user sur le pattern établi par le module zone (#2487) :
- `user-queries.utils.ts` : suppression du `userSelect`/`UserRecord` morts,
  signatures sur `Prisma.TransactionClient`, `createUser` purement DB (la
  validation du doublon email monte dans le service en `ConflictException`).
- `user.service.ts` : extraction de `resolveAdminRoleIds`,
  `patchUsersInTx`, `emitImpactedRoleEvents` ; patch des rôles sous
  transaction.
- `user.module.ts` : imports repliés sur `InfrastructureModule` (déjà
  exporté par celui-ci).

Refs #2738

Co-authored-by: Automata <automata@shikanime.studio>
Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr>
Change-Id: I3bd632f95dd466e585698eba738efcd86a6a6964
shikanime added a commit that referenced this pull request Sep 23, 2026
@shikanime @yorha-operator
refactor(user): realigner structure et style du module
ccba51a 
Aligne le module user sur le pattern établi par le module zone (#2487) :
- `user-queries.utils.ts` : suppression du `userSelect`/`UserRecord` morts,
  signatures sur `Prisma.TransactionClient`, `createUser` purement DB (la
  validation du doublon email monte dans le service en `ConflictException`).
- `user.service.ts` : extraction de `resolveAdminRoleIds`,
  `patchUsersInTx`, `emitImpactedRoleEvents` ; patch des rôles sous
  transaction.
- `user.module.ts` : imports repliés sur `InfrastructureModule` (déjà
  exporté par celui-ci).

Refs #2738

Co-authored-by: Automata <automata@shikanime.studio>
Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr>
Change-Id: I3bd632f95dd466e585698eba738efcd86a6a6964
shikanime added a commit that referenced this pull request Sep 23, 2026
@shikanime @yorha-operator
refactor(user): realigner structure et style du module
cdb5dcb 
Aligne le module user sur le pattern établi par le module zone (#2487) :
- `user-queries.utils.ts` : suppression du `userSelect`/`UserRecord` morts,
  signatures sur `Prisma.TransactionClient`, `createUser` purement DB (la
  validation du doublon email monte dans le service en `ConflictException`).
- `user.service.ts` : extraction de `resolveAdminRoleIds`,
  `patchUsersInTx`, `emitImpactedRoleEvents` ; patch des rôles sous
  transaction.
- `user.module.ts` : imports repliés sur `InfrastructureModule` (déjà
  exporté par celui-ci).

Refs #2738

Co-authored-by: Automata <automata@shikanime.studio>
Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr>
Change-Id: I3bd632f95dd466e585698eba738efcd86a6a6964
shikanime added a commit that referenced this pull request Sep 23, 2026
@shikanime @yorha-operator
refactor(user): realigner structure et style du module
2826688 
Aligne le module user sur le pattern établi par le module zone (#2487) :
- `user-queries.utils.ts` : suppression du `userSelect`/`UserRecord` morts,
  signatures sur `Prisma.TransactionClient`, `createUser` purement DB (la
  validation du doublon email monte dans le service en `ConflictException`).
- `user.service.ts` : extraction de `resolveAdminRoleIds`,
  `patchUsersInTx`, `emitImpactedRoleEvents` ; patch des rôles sous
  transaction.
- `user.module.ts` : imports repliés sur `InfrastructureModule` (déjà
  exporté par celui-ci).

Refs #2738

Co-authored-by: Automata <automata@shikanime.studio>
Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr>
Change-Id: I3bd632f95dd466e585698eba738efcd86a6a6964
shikanime and others added 16 commits October 2, 2026 17:08
@shikanime @yorha-operator
fix(user): emit canonical AdminRoleEventPayload and type controller i…
2936564 
…nputs

Emit the full { id, oidcGroup, members } payload that the 2749 event
bridge consumers expect, drop as never from the controller spec by
parsing inputs through the shared schemas, and move the relationType
default into buildAllUsersWhere so the controller passes the query
straight through.

Co-authored-by: Automata <automata@shikanime.studio>
Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr>
Change-Id: I28676aa618050a7042ed24dfa9e66b896a6a6964
@shikanime @yorha-operator
style(user): drop mock-wiring narration comment
e210617 
Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr>
Change-Id: Ieb2ee298f5d0547bf988787721ed029a6a6a6964

Co-authored-by: Automata <automata@shikanime.studio>
@shikanime @yorha-operator
refactor(user): batch AND filters into single pushes
e305dc0 
Co-authored-by: Automata <automata@shikanime.studio>
@shikanime @yorha-operator
fix(user): use the projectMembers relation key in memberOfIds filter
63345cb 
Co-authored-by: Automata <automata@shikanime.studio>
@shikanime @yorha-operator
fix(user): legacy 400 on unknown admin role, matching take:5, hook un…
a2cf7f4 
…ion semantics

Co-authored-by: Automata <automata@shikanime.studio>
@shikanime @yorha-operator
chore(user): drop section divider comments
c00e206 
Signed-off-by: Shikanime Deva <22115108+shikanime@users.noreply.github.com>

Co-authored-by: Automata <automata@shikanime.studio>
@shikanime @yorha-operator
refactor(user): realigner structure et style du module
effb5d6 
Aligne le module user sur le pattern établi par le module zone (#2487) :
- `user-queries.utils.ts` : suppression du `userSelect`/`UserRecord` morts,
  signatures sur `Prisma.TransactionClient`, `createUser` purement DB (la
  validation du doublon email monte dans le service en `ConflictException`).
- `user.service.ts` : extraction de `resolveAdminRoleIds`,
  `patchUsersInTx`, `emitImpactedRoleEvents` ; patch des rôles sous
  transaction.
- `user.module.ts` : imports repliés sur `InfrastructureModule` (déjà
  exporté par celui-ci).

Refs #2738

Co-authored-by: Automata <automata@shikanime.studio>
Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr>
Change-Id: I3bd632f95dd466e585698eba738efcd86a6a6964
@shikanime @yorha-operator
refactor(user): retirer l'alias AllUsersQuery au profit du schéma
cac74d2 
`AllUsersQuerySchema` étant exporté, l'alias `AllUsersQuery` est
redondant ; les consommateurs dérivent le type par `z.infer`.
`LettersQuery` est conservé (utilisé par le client).

Refs #1889

Co-authored-by: Automata <automata@shikanime.studio>
Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr>
Change-Id: I5d954715680b8fbcd866edf4bb300dc36a6a6964
@shikanime @yorha-operator
test(user): lock controller permission matrix
caecf77 
Co-authored-by: Automata <automata@shikanime.studio>
Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr>
@shikanime @yorha-operator
fix(user): purge dead create path and lock legacy parity
651e6d6 
- supprimer UserService.createUser et les helpers createUser/getUserByEmail
  (aucun appelant ni route au contrat : chemin mort signalé en revue)
- supprimer l'import faker inutilisé de user.controller.spec.ts
- verrouiller par spec : 400 (BadRequestException) sur adminRole inconnue,
  take:5 sur la recherche par lettres, émission union avant ∪ après

Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr>

Co-authored-by: Automata <automata@shikanime.studio>
@shikanime @yorha-operator
refactor(user): remove reflection-only permissions metadata check
8d0dc83 
Reflect.getMetadata assertions pass whether or not the guard is enforced
and add no behavioural coverage; the guard logic stays covered in
user.guard.spec.ts and the controller delegation tests are untouched.

Co-authored-by: Automata <automata@shikanime.studio>
Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr>
@shikanime @yorha-operator
fix(user): emit canonical AdminRoleEventPayload and type controller i…
74133da 
…nputs

Emit the full { id, oidcGroup, members } payload that the 2749 event
bridge consumers expect, drop as never from the controller spec by
parsing inputs through the shared schemas, and move the relationType
default into buildAllUsersWhere so the controller passes the query
straight through.

Co-authored-by: Automata <automata@shikanime.studio>
Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr>
Change-Id: I28676aa618050a7042ed24dfa9e66b896a6a6964
@shikanime @yorha-operator
style(user): drop mock-wiring narration comment
ba5e73d 
Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr>
Change-Id: Ieb2ee298f5d0547bf988787721ed029a6a6a6964

Co-authored-by: Automata <automata@shikanime.studio>
@shikanime @yorha-operator
refactor(user): move the letters filter inside its guard
9d8cef6 
Co-authored-by: Automata <automata@shikanime.studio>
@shikanime @yorha-operator
fix(user): restrict UserGuard to list and patch routes
8c1a923 
GET /api/v1/users/matching stays public like the legacy router.

Co-authored-by: Automata <automata@shikanime.studio>
Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr>
Change-Id: Ie8d52f472340f7fe114fbe25f11a32746a6a6964
@shikanime @yorha-operator
test(user): drop guard metadata specs
8731b8a 
Co-authored-by: Automata <automata@shikanime.studio>
Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr>
Change-Id: I1601b269c95ef1a8b6496ac93335e2a06a6a6964
@shikanime @yorha-operator
fix(user): use the projectMembers relation key in memberOfIds filter
5a117f4 
Co-authored-by: Automata <automata@shikanime.studio>
@cloud-pi-native-sonarqube

cloud-pi-native-sonarqube Bot commented Oct 2, 2026

Copy link
Copy Markdown

Passed Quality Gate passed

Issues

Measures

Project ID: cloud-pi-native_console_AYsa46O31ebDtzs-pYyZ

View in SonarQube

StephaneTrebel
StephaneTrebel approved these changes Oct 2, 2026
View reviewed changes

@StephaneTrebel StephaneTrebel left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approbation renouvelée : le filtre memberOfIds utilise désormais la relation Prisma projectMembers, tandis que GET /api/v1/users/matching reste public. Fils résolus ; aucune régression identifiée sur cette tête.

@shikanime
shikanime added this pull request to the merge queue Oct 2, 2026
Merged via the queue into main with commit 1fc04ab Oct 2, 2026
34 checks passed
@shikanime
shikanime deleted the pr/user-migration branch October 2, 2026 16:35
@github-actions github-actions Bot mentioned this pull request Oct 2, 2026
Open
StephaneTrebel pushed a commit that referenced this pull request Oct 5, 2026
@shikanime @yorha-operator @StephaneTrebel
refactor(user): realigner structure et style du module
950835c 
Aligne le module user sur le pattern établi par le module zone (#2487) :
- `user-queries.utils.ts` : suppression du `userSelect`/`UserRecord` morts,
  signatures sur `Prisma.TransactionClient`, `createUser` purement DB (la
  validation du doublon email monte dans le service en `ConflictException`).
- `user.service.ts` : extraction de `resolveAdminRoleIds`,
  `patchUsersInTx`, `emitImpactedRoleEvents` ; patch des rôles sous
  transaction.
- `user.module.ts` : imports repliés sur `InfrastructureModule` (déjà
  exporté par celui-ci).

Refs #2738

Co-authored-by: Automata <automata@shikanime.studio>
Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr>
Change-Id: I3bd632f95dd466e585698eba738efcd86a6a6964
StephaneTrebel pushed a commit that referenced this pull request Oct 5, 2026
@shikanime @yorha-operator @StephaneTrebel
refactor(user): realigner structure et style du module
656328b 
Aligne le module user sur le pattern établi par le module zone (#2487) :
- `user-queries.utils.ts` : suppression du `userSelect`/`UserRecord` morts,
  signatures sur `Prisma.TransactionClient`, `createUser` purement DB (la
  validation du doublon email monte dans le service en `ConflictException`).
- `user.service.ts` : extraction de `resolveAdminRoleIds`,
  `patchUsersInTx`, `emitImpactedRoleEvents` ; patch des rôles sous
  transaction.
- `user.module.ts` : imports repliés sur `InfrastructureModule` (déjà
  exporté par celui-ci).

Refs #2738

Co-authored-by: Automata <automata@shikanime.studio>
Signed-off-by: William Phetsinorath <william.phetsinorath-open@interieur.gouv.fr>
Change-Id: I3bd632f95dd466e585698eba738efcd86a6a6964
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@StephaneTrebel StephaneTrebel Awaiting requested review from StephaneTrebel
1 more reviewer
@github-code-quality github-code-quality[bot] github-code-quality[bot] left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@shikanime shikanime

Labels

built refactor Refactor code

Projects

None yet

Milestone

9.27.0

Development

Successfully merging this pull request may close these issues.

2 participants

@shikanime @StephaneTrebel